From e9eaa6bafb0e2d1257efe2d2ea811cb4f4b5c625 Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Thu, 18 Aug 2005 19:51:46 +0000 Subject: [PATCH] Remove support for xenbus driver subtypes since with the subtype field there's no fallback. Signed-off-by: Christian Limpach --- linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c | 10 +--------- linux-2.6-xen-sparse/include/asm-xen/xenbus.h | 2 -- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c index cfdd92fcdd..b346b9dddc 100644 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c @@ -48,8 +48,7 @@ static const struct xenbus_device_id * match_device(const struct xenbus_device_id *arr, struct xenbus_device *dev) { for (; !streq(arr->devicetype, ""); arr++) { - if (streq(arr->devicetype, dev->devicetype) && - streq(arr->subtype, dev->subtype ?: "")) + if (streq(arr->devicetype, dev->devicetype)) return arr; } return NULL; @@ -284,8 +283,6 @@ static void xenbus_release_device(struct device *dev) if (dev) { struct xenbus_device *xendev = to_xenbus_device(dev); - if (xendev->subtype) - kfree(xendev->subtype); kfree(xendev); } } @@ -331,11 +328,6 @@ static int xenbus_probe_node(struct xen_bus_type *bus, xendev->devicetype = xendev->nodename + strlen(xendev->nodename) + 1; strcpy(xendev->devicetype, type); - /* This might not exist, but that's OK. */ - xendev->subtype = xenbus_read(xendev->nodename, "subtype", NULL); - if (IS_ERR(xendev->subtype)) - xendev->subtype = NULL; - xendev->dev.parent = &bus->dev; xendev->dev.bus = &bus->bus; xendev->dev.release = xenbus_release_device; diff --git a/linux-2.6-xen-sparse/include/asm-xen/xenbus.h b/linux-2.6-xen-sparse/include/asm-xen/xenbus.h index 685b5d7a3e..d119b78ad4 100644 --- a/linux-2.6-xen-sparse/include/asm-xen/xenbus.h +++ b/linux-2.6-xen-sparse/include/asm-xen/xenbus.h @@ -37,7 +37,6 @@ /* A xenbus device. */ struct xenbus_device { char *devicetype; - char *subtype; char *nodename; struct device dev; int has_error; @@ -53,7 +52,6 @@ struct xenbus_device_id { /* .../device// */ char devicetype[32]; /* General class of device. */ - char subtype[32]; /* Contents of "subtype" for this device */ }; /* A xenbus driver. */ -- 2.30.2